Merge branch 'master' of http://git.denx.de/u-boot-sunxi
authorTom Rini <[email protected]>
Thu, 16 Apr 2015 16:51:23 +0000 (12:51 -0400)
committerTom Rini <[email protected]>
Thu, 16 Apr 2015 16:51:23 +0000 (12:51 -0400)

Trivial merge